docs(en): merge docs-cn/sync-docs into docs-cn/dev @ ea5391c0#974
Conversation
Co-authored-by: Codex <noreply@openai.com>
Co-authored-by: Codex <noreply@openai.com>
✅ Deploy Preview for cn-vitest ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 9b9d74fb38
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
| 如果自定义命令具有相同的名称,则它们将覆盖内置命令。 | ||
| ::: | ||
|
|
||
| <<<<<<< HEAD |
There was a problem hiding this comment.
Remove unresolved merge markers in commands doc
This file still contains Git conflict markers (<<<<<<<, =======, >>>>>>>), which means the merge was not resolved and both variants are published verbatim. In rendered docs this shows broken content structure and duplicate section intent, and in doc-processing pipelines it can also break tooling that assumes clean Markdown.
Useful? React with 👍 / 👎.
| - **类型:** `string` | ||
| - **默认值:** `'.vitest/attachments'` | ||
|
|
||
| <<<<<<< HEAD |
There was a problem hiding this comment.
Remove unresolved merge markers in attachmentsDir doc
The conflict marker block indicates an incomplete merge in this config page, so users will see raw conflict syntax and conflicting language variants instead of a single authoritative description. This is a correctness issue for published documentation and should be resolved before release.
Useful? React with 👍 / 👎.
| ::: danger 不支持的选项 | ||
| 部分配置选项不允许在项目配置中使用,主要包括: | ||
|
|
||
| <<<<<<< HEAD |
There was a problem hiding this comment.
Resolve merge conflict block in projects guide
An unresolved conflict block remains in the “unsupported options” section, leaving two contradictory list variants in the source. This causes end-user documentation corruption and makes it unclear which options are actually unsupported in project-level config.
Useful? React with 👍 / 👎.
此 PR 自动生成。
合并 vitest-dev/docs-cn 的修改至本仓库(@ ea5391c)
以下文件存在冲突,可能需要重新翻译:
请解决所有冲突后提交到此 pull request,可直接在 Github 修改、切换到 sync-ea5391c0-1 分支进行修改或者使用 Github Desktop 拉取此 pr 修改并提交。
禁止使用 Squash Merge 来合并此 Pull Request!
使用该操作会导致上游仓库的内容丢失,并致使下一次合并产生冲突。